some fix in srvice