Really fix #147