Fix for Issue #13.