Convert #521697 to Flügger