Addressed in f60bfd2