Convert #409246 to Flügger