Convert #517446 to Flügger