Fix problems caused by c9f3b1b94e3894fc13f1034a2412e85923173a55