Convert #652287 to Flügger