bug fix 3/122