Fix for issue #5431