2.03.1:zeress:49 Fix for Issue #84