YH FIX: ISSUE: 97 V:2