Fix #6024