Convert #361807 to Flügger