Convert #791387 to Flügger