Revert the quick fix of #4

This reverts commit ae52082232c465edd4a6760d523ac5ae3570682b.
a better fix for #4