Convert #387678 to Flügger