Convert #337529 to Flügger