Fix for Issue #23