Revert previous commit
Fixed #2