fixed live server regression