Convert #517035 to Flügger