Convert #679402 to Flügger