Convert #521477 to Flügger