deprecation fix