fix bu 101
merged bug fix 101
bug fix after cotinue working
bug fix after cotinue working master