Fix issue after merging