Added fix code to V-22341