fix bug 101
merged with fix bug 101