Convert #623339 to Flügger