attempt to fix #157