#43 bug fix