restored support for API 7