Issue closed #6638