fix class loading issue