API comparability fix