US5:roles fix