Hadn't completely fixed #44