Fixed class loading bug