#7627 Fix bug discussed