Fix outdated code which would make huge problems because of previous fix