Bug fix for guiD?  (nullable Guid)