Roles Bug Fix
Merging