fixed bug introduced by weird merging