attempt to fix #53