fixed another issues