fixed issue #547
Merge pull request #585 from safiyu/UIissue2

fixed issue #547