Attempt to fix #5