support api > 3.1