#7 bug fix