Convert #517986 to Flügger