Addressed in ceec2d9