Added the second check