Convert #517526 to Flügger