Attempting to fix #9