Add a simple fix for the regression introduced by markus's fix for issue #150. Not sure this is right.