Fix bug when using commando from server console