Convert #338605 to Flügger