And fixed another error