Convert #468377 to Flügger