Fix #6029