Fixed first instance of widget choice and widget attribute.