Convert #517336 to Flügger