Convert #361127 to Flügger