Attempting to fix #35