Convert #651295 to Flügger