fix increemental update crash; add test case