Fixed issue with parsing non data lines