It is a simple fix and the given patch #2 works well.
We can merge it.