Final fix for repeating locations