Fix for big repo slowness