Add explict check