API consistency fix