Convert #521381 to Flügger