Convert #355077 to Flügger