fix for bubbi