Update handeling of genotype swap