Convert #394426 to Flügger