Preliminary fix for update race ignore issue, thank to @a.selle