Update to the Z18 and fix a possible crash.