Fix bug introduced by merge