YH FIX: ISSUE: 97