(!) Fix: Freeze problem