Issue #194, fixing long lines