Convert #613461 to Flügger