Larger than small commit but still a big fix.