Fix multi-line handling