Try and fix #75 again