fixed guid issues
fixed guid issues