Fixed issue with guid comparisons