Fixed ugly bug
Fixed roles