bug fix, #7