bug fix 39
bug fix 40