Convert #335941 to Flügger