Fix for Issue 36 doesn't work

Revert the fix because Issue44 solved