#8: initial commit for bug fix