Convert #390838 to Flügger