Further trying to fix the class conflicts