Fix for issue #2832