resolve parse/stringify issues