Fix access control [Close #436]