Attempt to fix #1