Convert #226295 to Flügger