Addressed in next commit