Convert #419358 to Flügger