Fixed Wrapper class loader