suite: fix + handling