* Continue trying to fix class loading bug