Fixed #32 with using begin/endUpdates. Still need to test this vigorously.