Fix: PID 24976765 Issue WPFerg#16

Fix: PID 24976765 Issue WPFerg#16