FIX: Fix callbacks