Fix conditions based on accessed rights