Convert #517894 to Flügger