Convert #419829 to Flügger