Convert #521535 to Flügger