Convert #521367 to Flügger