Convert #651477 to Flügger