Convert #521935 to Flügger