This bug fix should probably be in it's own commit.