fixing to support latest ext-lib.