bug fix 21:43