Addressed in f6950fc