bug fix 6.13.18:40