Convert #335390 to Flügger