Convert #521387 to Flügger