FIX: Fix count