more failsave code, remove imho unneeded invalidate calls