merge fixes #2