fixed bug introduced my merge