Fix for issue #371.

Hello,

I am not sure how to test this :-)

Regards
Mirko