attempt to fix #121