Attempt to fix commands, again