Fix for Issue #18.