Convert #517423 to Flügger