Fix oneOf