Fixed issue with Maps with non-string keys being wrapped in JSON objects