Fix genotype end block