Convert #521769 to Flügger