Convert #624591 to Flügger