Convert #349346 to Flügger