fixed bug after merging