Merge pull request #2840 from elfiesmelfie/fix_deprecated_func