Fixed issue with Guids