Addressed in 578002e