Fix for Issue #3