pp1 fixes #1