Convert #517739 to Flügger