Convert #624627 to Flügger