Addressed in bcd9d6d