Fixed issue after merge