Convert #624394 to Flügger