Fix immediate validity detection