fixed server issue