bug fixed from live server