Convert #227396 to Flügger