Adding workaround for JSON Stringify issue