Ensure suffix is on a new line

Note: I need this in a release of v0.2 (I have branched off of the latest v0.2.x).