Convert #517439 to Flügger