Save vice-verse patch for Lazarus/Typhon