Addressed in ce90065