Fixed line-breaking (closes #664)