fixed access issues