Added fix for Issue #23