Convert #542629 to Flügger