Attempting to fix #236