pull in another fix from the ui