fix class conflict