fixed scope parsing on token implementation, too