Fix #6012