Convert #521337 to Flügger