Fix for role issue
Merge https://github.com/sattes/soprepository