Attempting to fix #43