Convert #521627 to Flügger