fixed to work with server-ctrl singleton