Convert #548431 to Flügger