Correct incorrect 2PI calc. Closes #648