Convert #228488 to Flügger