Fixing command saves