Convert #436747 to Flügger