fix access bugs