Convert #521828 to Flügger