Fixed incremental updates

Fixes #1473