NYCCHKBK-3537 - After reverting the auto-complete codes, I again had to fix the bug that was existing