Fix uuid generator