Addressed in 60c2ac7