Convert #359336 to Flügger