Convert #623107 to Flügger