Convert #616897 to Flügger