support 1.1.0-rc18 API