Fixed parsing problem with fields not in form 'X=Y'