fixes to yup controller