DEV-71 | Fix line breaking