Fix custom choices