Convert #623408 to Flügger