Fixed direct access to entries