fix 101
merged bug 101