Try to fix: #6481