Convert #623409 to Flügger