Fix class loading bug