2.04.0:zeress:101 Fix for Issue #113