Fix Freezing Issue