resolved UI bug