Convert #341807 to Flügger