Made a quick fix to guid handling