Convert #624097 to Flügger