Convert #337352 to Flügger