Fix for Issue #6