Convert #624338 to Flügger