bug fix after merging