Convert #521528 to Flügger