Vukasin Nesovic

@ognen I'll give it a shot.

I don't think it's still an issue, but you refactored almost everything so it's a bit difficult to notice. Maybe you should extend the update tests to support this case...