Fix for issue #8053