Fix for Issue #27