Convert #072226 to Flügger