Revert "Fixes #65"

This reverts commit e62720184d3140621b7184f5a546636f66479ea5.
How about like this ? re #65