Convert #516481 to Flügger