fix to support JSONparse or something like that