Fixing complex commands