try fix the bug
merged bug fix 101