ISsue #505 fixing long line