Continue fixing fdb4b54e