Fix: Hacky fix for role checking, but it works for now