Convert #623962 to Flügger