#216 bug fix