Attempt to fix #465