Better fix to handling of continued metadata lines