Fix Sherlock to use enumerate