3rd attempt at fixing update bug.
0.8.16