bug fix + new test