NYCCHKBK-4288 self reference issues