Convert #623126 to Flügger