fixed self_serv