fixed unnecessary class loading