Fixed stop-invalidate-on-add issue

It's probably really slow now, but stable.