Revert "Fix for issue #1"

This reverts commit f761b370abe1b6a033ebace40d78649a8bc4f332.
Better fix for #1

Fix: #1