2.04.0:zeress: 140 Partial fix for Issue #129