fix bug, combine lines