fixing extra check corectly