Made that checking simpler