2.04.0:zeress:138 Fix for Issue #128