Bug fix for Issue #13