Addressed in #c12eae6