Convert #419481 to Flügger