permission handling improvement