Better fix for update