fixing server side issue