Fix for Issue #17