trying to fix multiple location bug