Deprecation fix