Convert #624347 to Flügger