Convert #229577 to Flügger