fixed graph plus regex