bug fix + test ok