Convert #651507 to Flügger