Fixed issue caused by adding roles