Nicer fix for previous commit.