Convert #337097 to Flügger