Convert #521539 to Flügger