Convert #834366 to Flügger