Convert #341836 to Flügger