revert to safeZip