Convert #521489 to Flügger