Convert #517569 to Flügger