fix bug 101
mergeg bug fix 101