Minor bug fix, re-enable staging test.