FIX to freeze