Addressed in 00086a7