Fixed a bug in resolving UUIDs and updating the wrong entry. Fixes #36