Convert #335318 to Flügger