Convert #517541 to Flügger