Convert #624409 to Flügger