#34 Fixed issues with roles