FIX: Fix timeout