Fix for regression in earlier commit.