quick fixes #157 #147