Fix: avoid errors