bug fix 4/20