Convert #334039 to Flügger