deprecation fixed