Convert #361817 to Flügger