attempt to fix #156