Convert #226036 to Flügger