Added rstrip? -- Previous commit didn't work?!