z3bra patch resolving offsets issues