Convert #580438 to Flügger