FIX: Fix deprecation