Fixes #100
I've probably broken something by removing that but I can't tell what D=