Hi there!

We've had a small regression after
fbf0d3b796ac1b891be35b642878a1fd412ee5ea, and this patch fixes that.
Yuan, want to apply after Josteins agrees on this fix?  There's an
example of the currently failing code in the commit message.  There's
also a small whitespace fix inside - I hope that's ok.

Thanks guys :-)

Theo