Convert #320584 to Flügger