Addressed in aefb3a3