fixed access related issues