Fixed issue after merging