Convert #665387 to Flügger