Added fix for long lines