Convert #438643 to Flügger