fix temporary (scalability problems - accession pattern)