Convert #623237 to Flügger