2.04.0:zeress:144 Final fix for Issue #129