fix bug o1
merged bug fix 01