Convert #521438 to Flügger