Fixed line too long issue