3.3 API change fix