Add repopick fix