FIX: Deal with deprecation