merge fix #2!?