Changes to solve issue #6929