fixing Deprecation issue