fixed bug introduced by merge