Try to fix the update bug, probably make it worse