Person and Organization is both being used as @type

I read a few tickets about some sites not recognizing the logo on the markup of the AMP pages.

This happens on our site, too.

When I run the AMP page on Google Rich Results, I see that the Type markup is both reading Person and Organization.
Then the “logo” field is just using the “image” tag.

On our staging, the problem got fixed when I switched from Person to Organization. And then it finally read the logo correctly.

How can we fix it for our main site?