fix access logic