Convert #228605 to Flügger