2.04.0:zeress:145 Fix for Issue #133