glitter fix + member data fix