JSON fix

Change-Id: I5d735871c20c13be10ede8eba5737bcee6b6a559