Convert #516336 to Flügger