Convert #517946 to Flügger