Revert "a little bit better fix for issue #178"

This reverts commit a8b58ccf105368f6fda3c75050c98e4a436e5b3d.