Do not treat -- in the middle as a field

Change-Id: I331693babbd4b5acbf0fde0a411dcc715eefb57e