2.07.2:Foffy123:41 Fix for Issue #226