FIX: Fix setup