Removing json-mode bugginess.