Fixed conditional complition issues