Convert #517619 to Flügger