Convert #419638 to Flügger