Convert #517954 to Flügger