Fixed #58 again, hopefully for good.