FIX: Fix deprecated conversion