Convert #624828 to Flügger