Convert #521597 to Flügger