Fix for Issue #14.