Convert #521837 to Flügger