Convert #517633 to Flügger