[TS-3248]: Fix with Susan's help to resolve crash introduced in TS-3189