Convert #355849 to Flügger