Small fix in merged code