Temp fix before fully upgrade server