Convert #624351 to Flügger