Convert #624337 to Flügger