Convert #521906 to Flügger