add condition to execute fix