Addressed in 7a538c7