Custom repo bugfix