Fixing possible error when updating works see BT#8892