Convert #517339 to Flügger