change to 2.2 API (my mistake)