Convert #335490 to Flügger