Convert #355367 to Flügger