Final pass to fix the variance bug