[Issue #164] Fixed mistake in merge