Convert #521679 to Flügger