fixed class loader issues