fixed bug added by incomplete merge