Simplify and prove 2.17
Fixup