Fixed bug introduced by merge conflict