Convert #516629 to Flügger