#14 bug fix