Fix building of command