Addressed in fffb058