Convert #829638 to Flügger