Fixed double updating