(#603) - fix + test