Fix class loader dectection