Convert #521607 to Flügger