Correct order of invalidation for add methods with passes. Closes #476