Possibly fixed another bug