Fix handling of new lines inside descriptions

At least, I THINK this is what it is supposed to do...