Add safe-reattach...