2.04.0:zeress:104 Fix for Issue #116