Convert #436489 to Flügger