fixed bug caused by merging