Accounted for live server issues