YH Fix: Issue 89. V:2