removed fix for #4 that didnt work