Convert #521946 to Flügger