Fix choices while validating