Convert #319829 to Flügger