embedded json unmarshal fix