Attempt to fix #43