Convert #335690 to Flügger