Fix 173

This one fixes issue #173 and makes Michael very happy