Convert #517324 to Flügger