Convert #436247 to Flügger