fix class manipulation issue