That's old code, but may as well fix it