Resolve last deprecation