This should have been moved earlier in the fix for Issue 346.