Addressed in d5b9f52