one more fix + tests