Missed these changes in previous commit.