Fix #5943