fix small issue after merging