fixed body parsing