fixing bug after merging