Fixes random GUID issues