Fixing the fix for #50.