Convert #521687 to Flügger