Convert #721426 to Flügger