Convert #613745 to Flügger