Convert #623528 to Flügger