Convert #521584 to Flügger