Convert #187682 to Flügger