fixed issue #485
Merge pull request #576 from safiyu/UIissue2

fixed issue #485