Convert #439351 to Flügger