Convert #521228 to Flügger