this should fix 2 race conditions from INVALIDATE state