Fix for immediate validation same/same