2.04.0:zeress:139 Final fix for Issue #115