fixed bug issue-54