fix the bug
merge bug101