Convert #436647 to Flügger