Convert #651219 to Flügger