Convert #521797 to Flügger