Convert #624529 to Flügger