Fix 'fix chunk freezes'