Fixed issue after reviewing on staging