Fix order of commands, comp add must be first