bmmcginty fix from f123 for barnard-ui