attempt to fix #2