Added a fix for Invalidations clearing