virtualbox restore snapshot results in broken media list

[AZ]

I've got virtualbox 4.0.4 OSE running with several windows virtual machines that each have several snapshots (1-4) and saved states attached.
When restoring the most recent snapshot (discarding the current state), this results in a new vdi file being created and entered in the virtual machine xml file but not in the virtualbox.xml file. Further, the old vdi file is still in the virtualbox xml file.
This results in virtualbox complaining on restart about non-accessible media [the snapshot vdi] (that can be removed from the known media list) and the virtual machine referencing a non-existing snapshot image.
Upon fixing the virtualbox.xml file by replacing the old uuid with the new uuid, virtualbox runs fine. The saved state was ok, that means the virtual machine could be resumed after that.

I would have expected that virtualbox updates the virtualbox.xml itself.

ProblemType: Bug
DistroRelease: Ubuntu 11.04
Package: virtualbox-ose 4.0.4-dfsg-1ubuntu4.1
ProcVersionSignature: Ubuntu 2.6.38-13.53-generic-pae 2.6.38.8
Uname: Linux 2.6.38-13-generic-pae i686
Architecture: i386
Date: Wed Dec 28 21:02:21 2011
ProcEnviron:
 SHELL=/bin/bash
 PATH=(custom, no user)
 LANG=de_DE.UTF-8
SourcePackage: virtualbox-ose
UpgradeStatus: Upgraded to natty on 2010-05-15 (592 days ago)