Built in an extra check