Fix for wrap lines issue