#10 bug fix