pach fix + test