Revert "Fixed #15"

This reverts commit 34a8f34daa487fc19bea79d044bd1bcb456a5217.