Revert "Fix #48"

This reverts commit 58b8a641096b54b6726abc895645848a07b8b2b5.
Better fix for #48