Convert #436783 to Flügger