Fix command creation