Convert #228418 to Flügger