API 10 compatibility fix