Convert #721438 to Flügger