Fixed race condition, changes aren't visible until they've all been staged