Fixing onAdd recursion.