Convert #516426 to Flügger