YH FIX: ISSUE: 95