Fix for 2.2 API