Fix for 2.2.0 API