Bad merge fix #1