Convert #367635 to Flügger