Fix issue #2

Now it's clean. Fixes #2