take care of Deprecation Warning