Fix available roles issue #34