Bad merge, fixes #5