#7 just a little bug fix