Fixes AN-350

And and AN-356 and other duplicates… hopefully.