fix bug 101.
merged bug fix 101