Fixing issue after merge