fixed double firing issue