Convert #226407 to Flügger