Convert #226597 to Flügger