support for API fixes