fixed issue #629
Merge pull request #630 from safiyu/UIissue5

fixed issue #629