Convert #387675 to Flügger