Convert #228530 to Flügger