Fix: optimization
Fix: avoid error