Fix the way Id is returned