Addressed in d9d261d