Fixed varying deprecation problem