Update w/ indexOf() bug fix.