Convert #228926 to Flügger