FIXED the trap OID overflow problem