better fix for #57

This makes sure it gets fixed in all occasions, because I missed some