Fixed class loader inconsistency