Addressed in next commit.