Fix for issue #3213