Fix for issue #2029