Fixed bug introduced by merge