Convert #521638 to Flügger