Fix for Issue #5.