added back resolve inconsistencies until the new API launches