Fixed support uuid issue