Convert #391619 to Flügger