Removed fix for #74 that doesn't work