Fix class loading issue