Convert #361124 to Flügger