fixed invalidation that broke with new key generator logic