Convert #623219 to Flügger