Convert #419246 to Flügger