Fix: add condition