Attempting to fix #2