fixing the guid scheme