fix multiple add guards