fix bug 101
merged bug fix 101
fix bug 101
fix 101
fix 101