Fixed a bug introduced by the merge