Convert #436846 to Flügger