Access check fix