Patch for improving unload on zap (thanks James)