-- fixed another bugs