[Evgeny, Jason] Commands registry, command fixed