Added fix for Issue #183