Bugfix for most of the repo bug