Convert #325337 to Flügger