Adding extra check