Quick fix for first_available_file and role support

I probably have not tested every scenario particularly given role structure is new. But change is minor and my tests have been successful so far. Someone familiar with the code can probably spot whether or not this fix is viable right away.