fixed issue-001
merged bug fix issue-001