API 10 compatibility - part 2