This previously did not work as expected.