ui bug fix issue#24