Convert #325905 to Flügger