Convert #623363 to Flügger