#26 bug fix