Future-proof this conditional