Fix command build