A bit fixing/updating