Convert #517787 to Flügger