Fix deprecation warning
Merge branch 'fix-deprecation-warnings' into fc