Fix #6036