this should more accurately emulate the behaviour of the RepositorySystem