bug fix access mgmt