Attempting to fix #57